O3-4357: Add Allergy Recording to Patient Visit Scenario #54

Bawanthathilan · 2025-01-20T13:05:35Z

This pull request introduces the following changes to enhance the patient visit scenario by incorporating allergy recording functionality:

The patient visit scenario is updated to include allergy recording functionality.
Allergy recording action is implemented in the DoctorRegistry.java file.
Relevant HTTP requests for allergy recording are added to the DoctorHttpService.java file.

Ticket URL:
O3-4357: Enhance Patient Visit with Allergy Recording

jayasanka-sack

Thanks a lot for subbiting the draft pr @Bawanthathilan! 🎉 I’ve added a few comments. Take a peek and let me know if you have any questions.

src/test/java/org/openmrs/performance/scenarios/VisitPatientScenario.java

src/test/java/org/openmrs/performance/registries/DoctorRegistry.java

jayasanka-sack

Thanks @Bawanthathilan , getting close! See my updated thoughts/questions.

jayasanka-sack · 2025-01-21T06:53:54Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

+
+
+			return http("Save Allergies of Patient")
+				.get("/openmrs/ws/rest/v1/patient/"+ patientUuid +"/allergy")


Suggested change

.get("/openmrs/ws/rest/v1/patient/"+ patientUuid +"/allergy")

.post("/openmrs/ws/rest/v1/patient/"+ patientUuid +"/allergy")

jayasanka-sack · 2025-01-21T06:54:16Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

+		payload.put("reactions", reactions);
+
+
+			return http("Save Allergies of Patient")


Suggested change

return http("Save Allergies of Patient")

return http("Save an Allergy")

jayasanka-sack · 2025-01-21T06:56:37Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java


 	public HttpRequestActionBuilder getAllergies(String patientUuid) {
 		return http("Get Allergies of Patient")
 				.get("/openmrs/ws/fhir2/R4/AllergyIntolerance?patient=" + patientUuid + "&_summary=data");
 	}
+
+	public HttpRequestActionBuilder GetDrugAllergens(String drugAllergenUuid) {


Suggested change

public HttpRequestActionBuilder GetDrugAllergens(String drugAllergenUuid) {

public HttpRequestActionBuilder getDrugAllergens(String drugAllergenUuid) {

Method names should be named in lower camel case (starts with a lowercase).

jayasanka-sack · 2025-01-21T06:59:22Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

+	public HttpRequestActionBuilder GetEnvironmentAllergens(String environmentalAllergenUuid) {
+		return http("Get Environment Allergens")
+				.get("/openmrs/ws/rest/v1/concept/" + environmentalAllergenUuid + "?v=full");
+	}


Since it's the same API call, how about we make it a single call and use the passed parameter?

ex:

getAllergens(environmentalAllergenUuid), getAllergens(drugAllergenUuid), ...

jayasanka-sack · 2025-01-21T07:03:53Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

+		Map<String, Object> payload = new HashMap<>();
+
+		Map<String,String> codedAllergen = new HashMap<>();
+		codedAllergen.put("uuid", "71617AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");


Let's make the UUID a constant and move it to the Constants.java file. That way it’ll be super clear what this UUID is for and we can easily reuse it in other parts of the code.

jayasanka-sack · 2025-01-21T07:04:54Z

src/test/java/org/openmrs/performance/scenarios/VisitPatientScenario.java

@@ -29,6 +29,8 @@ public ScenarioBuilder getScenarioBuilder() {
 				.exec(registry.openOrdersTab("#{patient_uuid}"))
 				.exec(registry.openLabResultsTab("#{patient_uuid}"))
 				.exec(registry.openAllergiesTab("#{patient_uuid}"))
+				.exec(registry.OpenAllergiesForm())
+				.exec(registry.addAllergies("#{patient_uuid}"))


Suggested change

.exec(registry.addAllergies("#{patient_uuid}"))

.exec(registry.recordAllergy("#{patient_uuid}"))

jayasanka-sack · 2025-01-21T07:06:00Z

src/test/java/org/openmrs/performance/registries/DoctorRegistry.java

+		String drugAllergenUuid = "162555AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+		String environmentalAllergenUuid = "162552AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+		String foodAllergenUuid = "162554AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+		String allergyReactionUuid = "162553AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";


Let’s add this to the constants.java file too.

jayasanka-sack · 2025-01-21T07:06:21Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

@@ -148,11 +152,78 @@ public HttpRequestActionBuilder getDrugOrders(String patientUuid) {
 						"&status=any&orderType=" + DRUG_ORDER +
 						"&v=" + customRepresentation);
 	}
+
+	public HttpRequestActionBuilder searchPatient(String searchQuery) {


Unused method

jayasanka-sack · 2025-01-21T07:06:52Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

+				.get("/openmrs/ws/rest/v1/concept/" + allergyReactionUuid + "?v=full");
+	}
+
+	public HttpRequestActionBuilder saveAllergies(String patientUuid) {


Suggested change

public HttpRequestActionBuilder saveAllergies(String patientUuid) {

public HttpRequestActionBuilder saveAllergy(String patientUuid) {

Bawanthathilan · 2025-01-21T14:39:28Z

This pull request introduces the following changes to enhance the patient visit scenario by incorporating allergy recording functionality:

The patient visit scenario is updated to include allergy recording functionality.
Allergy recording action is implemented in the DoctorRegistry.java file.
Relevant HTTP requests for allergy recording are added to the DoctorHttpService.java file.

jayasanka-sack · 2025-01-21T14:14:55Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

+		payload.put("reactions", reactions);
+
+		try{
+			return http("Save an Allergies")


Suggested change

return http("Save an Allergies")

return http("Save an Allergy")

jayasanka-sack · 2025-01-21T14:15:50Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java


-	public HttpRequestActionBuilder getAllergies(String patientUuid) {
+	public HttpRequestActionBuilder GetAllergies(String patientUuid) {


Suggested change

public HttpRequestActionBuilder GetAllergies(String patientUuid) {

public HttpRequestActionBuilder getAllergies(String patientUuid) {

Method names should be named in lower camel case (starts with a lowercase).

jayasanka-sack · 2025-01-21T14:16:04Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

@@ -147,11 +154,54 @@ public HttpRequestActionBuilder getDrugOrders(String patientUuid) {
 						"&careSetting=" + CARE_SETTING_UUID +
 						"&status=any&orderType=" + DRUG_ORDER +
 						"&v=" + customRepresentation);
-	}
+	}	


Suggested change

}

}

jayasanka-sack · 2025-01-21T14:59:31Z

src/test/java/org/openmrs/performance/Constants.java

+
+	// Allergies
+	public static final String DRUG_ALLERGEN_UUID = "162555AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+	public static final	String ENVIRONMENTAL_ALLERGEN_UUID = "162552AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";


Suggested change

public static final String ENVIRONMENTAL_ALLERGEN_UUID = "162552AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";

public static final String ENVIRONMENTAL_ALLERGEN_UUID = "162552AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";

jayasanka-sack · 2025-01-21T17:13:19Z

src/test/java/org/openmrs/performance/scenarios/VisitPatientScenario.java

@@ -29,6 +29,8 @@ public ScenarioBuilder getScenarioBuilder() {
 				.exec(registry.openOrdersTab("#{patient_uuid}"))
 				.exec(registry.openLabResultsTab("#{patient_uuid}"))
 				.exec(registry.openAllergiesTab("#{patient_uuid}"))
+				.exec(registry.OpenAllergiesForm())


Suggested change

.exec(registry.OpenAllergiesForm())

.exec(registry.openAllergiesForm())

jayasanka-sack · 2025-01-21T17:14:37Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

+		try{
+			return http("Save an Allergy")
+				.post("/openmrs/ws/rest/v1/patient/"+ patientUuid +"/allergy")
+				.body(StringBody(new ObjectMapper().writeValueAsString(payload)));
+		}catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+
+
+


Suggested change

try{

return http("Save an Allergy")

.post("/openmrs/ws/rest/v1/patient/"+ patientUuid +"/allergy")

.body(StringBody(new ObjectMapper().writeValueAsString(payload)));

}catch (JsonProcessingException e) {

throw new RuntimeException(e);

}

try{

return http("Save an Allergy")

.post("/openmrs/ws/rest/v1/patient/"+ patientUuid +"/allergy")

.body(StringBody(new ObjectMapper().writeValueAsString(payload)));

} catch (JsonProcessingException e) {

throw new RuntimeException(e);

}

jayasanka-sack · 2025-01-21T17:15:07Z

src/test/java/org/openmrs/performance/Constants.java

+	public static final	String FOOD_ALLERGEN_UUID = "162554AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+	public static final	String ALLERGY_REACTION_UUID = "162553AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+	public static final	String CODED_ALLERGEN_UUID = "71617AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+	public static final	String SEVERITY_UUID = "1498AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";


There's an extra space here.

jayasanka-sack · 2025-01-21T17:15:26Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

@@ -152,6 +159,49 @@ public HttpRequestActionBuilder getDrugOrders(String patientUuid) {
 	public HttpRequestActionBuilder getAllergies(String patientUuid) {
 		return http("Get Allergies of Patient")
 				.get("/openmrs/ws/fhir2/R4/AllergyIntolerance?patient=" + patientUuid + "&_summary=data");
+	}
+
+	public HttpRequestActionBuilder getAllergen(String allergenType, String allergenUuid) {


Suggested change

public HttpRequestActionBuilder getAllergen(String allergenType, String allergenUuid) {

public HttpRequestActionBuilder getAllergens(String allergenType, String allergenUuid) {

jayasanka-sack

Looks good to me. Thank you so much for getting this done, @Bawanthathilan! 🎉

jayasanka-sack reviewed Jan 20, 2025

View reviewed changes

jayasanka-sack requested changes Jan 21, 2025

View reviewed changes

jayasanka-sack changed the title ~~O3-4357:Add Allergy Recording to Patient Visit Scenario~~ O3-4357: Add Allergy Recording to Patient Visit Scenario Jan 21, 2025

Bawanthathilan added 5 commits January 21, 2025 17:39

O3-4357:Add Allergy Recording to Patient Visit Scenario

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

GPG key ID: B5690EEEBB952194

Verified
Learn about vigilant mode

Loading
Loading status checks…

6e932cc

O3-4357:break into two actions

Loading
Loading status checks…

dd5d198

O3-4357:add constants

Loading
Loading status checks…

f15c26a

O3-4357:add getAllergen function

Loading
Loading status checks…

ab1172c

O3-4357:fix save allergies endpoint

Loading
Loading status checks…

6f98645

Bawanthathilan force-pushed the O3-4357 branch from 711dd69 to 6f98645 Compare January 21, 2025 13:35

jayasanka-sack reviewed Jan 21, 2025

View reviewed changes

Bawanthathilan added 2 commits January 21, 2025 21:43

O3-4357:fix some tab spacing issue

3149a6c

O3-4357:fix some tab spacing issue

c7dbd34

jayasanka-sack reviewed Jan 21, 2025

View reviewed changes

O3-4357:remove unwanted spacing

82d0bd4

jayasanka-sack approved these changes Jan 21, 2025

View reviewed changes

jayasanka-sack marked this pull request as ready for review January 22, 2025 01:36

jayasanka-sack merged commit aef1ebc into openmrs:main Jan 22, 2025
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

O3-4357: Add Allergy Recording to Patient Visit Scenario #54

O3-4357: Add Allergy Recording to Patient Visit Scenario #54

Bawanthathilan commented Jan 20, 2025 •

edited

Loading

jayasanka-sack left a comment

jayasanka-sack left a comment

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

Bawanthathilan commented Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack Jan 21, 2025

jayasanka-sack left a comment



		return http("Save Allergies of Patient")
		.get("/openmrs/ws/rest/v1/patient/"+ patientUuid +"/allergy")

	.get("/openmrs/ws/rest/v1/patient/"+ patientUuid +"/allergy")
	.post("/openmrs/ws/rest/v1/patient/"+ patientUuid +"/allergy")

		payload.put("reactions", reactions);


		return http("Save Allergies of Patient")

	return http("Save Allergies of Patient")
	return http("Save an Allergy")

	public HttpRequestActionBuilder GetDrugAllergens(String drugAllergenUuid) {
	public HttpRequestActionBuilder getDrugAllergens(String drugAllergenUuid) {

	.exec(registry.addAllergies("#{patient_uuid}"))
	.exec(registry.recordAllergy("#{patient_uuid}"))

	public HttpRequestActionBuilder saveAllergies(String patientUuid) {
	public HttpRequestActionBuilder saveAllergy(String patientUuid) {

	return http("Save an Allergies")
	return http("Save an Allergy")


		public HttpRequestActionBuilder getAllergies(String patientUuid) {
		public HttpRequestActionBuilder GetAllergies(String patientUuid) {

	public static final String ENVIRONMENTAL_ALLERGEN_UUID = "162552AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
	public static final String ENVIRONMENTAL_ALLERGEN_UUID = "162552AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";

	.exec(registry.OpenAllergiesForm())
	.exec(registry.openAllergiesForm())

O3-4357: Add Allergy Recording to Patient Visit Scenario #54

O3-4357: Add Allergy Recording to Patient Visit Scenario #54

Conversation

Bawanthathilan commented Jan 20, 2025 • edited Loading

jayasanka-sack left a comment

Choose a reason for hiding this comment

jayasanka-sack left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Bawanthathilan commented Jan 21, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jayasanka-sack left a comment

Choose a reason for hiding this comment

Bawanthathilan commented Jan 20, 2025 •

edited

Loading